fix properties handling
Merge pull request #9 from viteke/master

update