Check the new properties before the deprecated ones
Check the new properties before the deprecated ones
Merge pull request #25 from continuuity/hotfix/new-properties-first

Hotfix/new properties first