magic property makeover
Merge pull request #361 from subvertallchris/master

magic property makeover