Merge pull request #10 from lqi/master

Catch up with recent changes for 0.8