0.5.0 compatibility
Merge pull request #7 from julianlam/0.5.0-compat

0.5.0 compatibility