Refactor how properties are parsed
Merge pull request #590 from hurtonm/master

Refactor how properties are parsed