Better error management
Removed tabs
Fixed indentation and pep8 issues
Removed debugging prints
Merge pull request #20 from gem/better-error-management

Better error management