Improve error checking
Update to 0.9.0
Merge pull request #59 from brentongunning/master

Merge latest