refactored shit
Merge pull request #38 from jhaybie/PropertyList

refactored shit