Initial commit
Merge pull request #1 from mantiscy/master

Initial commit
Corrected error handling
Merge pull request #2 from mantiscy/master

Corrected error handling