Merge pull request #33 from REAANDREW/master

Did not push to the develop branch D.O.H.
Wrapped classes now maintain their non-method properties
Merge pull request #34 from Stono/develop

Wrapped classes now maintain their non-method properties
Merge branch 'master' into develop
0.1.15