Merge pull request #2 from shackbarth/keith2