Merge pull request #7 from r-ekladstrup/master

Issue #1231 change properties usage to aavoid conflicts
Issue #1316 support for hash column