error reporting
Merge pull request #4 from kantale/master

error reporting