Merge pull request #1 from NLeSC/develop

Fixed 1.5.0 properties bug
Merge branch 'develop'
Merge branch 'master' into develop