Fixed error handling
Merge pull request #6 from mjhea0/cleanup

Cleanup
Updating
Fix conflicts
removed .pyc