Added properties
Merge branch 'develop'
Combined with develop