Fix leak and multiply defined variable

Variable `prop` was leaking, and `property` was multiply defined and was being used outside of various scopes. 
Merge pull request #14 from jessejlt/patch-1

Fix leak and multiply defined variable