Merge pull request #18 from hAdamm/master

Bugfixes
Fix bad error message
Merge branch 'as-bugFix'