property update
Merge pull request #43 from Blir/dev

property update