Fixes/Implements #204: Return non-zero error code on error
changed CamelCase to under_score to conform to style
Merge pull request #205 from linuxlefty/master

Fixes/Implements #204: Return non-zero error code on error