Merge pull request #122 from doug-martin/master

v0.7.0
v0.8.0