Merge pull request #57 from johnb30/master

Fixing errors.