Merge pull request #4 from UsabilityTools/master

minor fixes + error catching