Fixes from comments.
Merge pull request #25 from kevgo/fixes

Fixes from comments.