Slight changes for v0.3/v0.4 compatibility.
Merge pull request #58 from joehuchette/master

Slight changes for v0.3/v0.4 compatibility