Fix errors.
Merge pull request #41 from johnb30/master

Fix errors.