minor bug corrections
new properties
Merge origin/master