fix bugs
enable properties edit
Merge branch 'issues#001' into develop