Fix bad condition and error message
Remove mapping column names to properties names
Fix bad construct query
Merge branch 'as-bugFix'
Merge pull request #18 from hAdamm/master

Bugfixes