Merge pull request #17 from tjohnman/master

Fixed previous fixes