fixed getting properties
should reference as object
fixed call to escape method
refectored to fix tests
Merge branch 'develop'