Merge pull request #46 from rohaus/master

Correct property names
Merge branch 'dev'