better error handling
Merge pull request #1 from 3on/master

Latest changes to main repository