0.2.9, more object reference issues
Merge pull request #14 from boneskull/master

0.2.9, more object reference issues