Fixed issue with properties
Added properties class
Merged with dev
Merge pull request #26 from DannyFesperman/propentity

Added Properties class