Merge pull request #281 from davidhalter/dev

New release: 0.7.0
Merge branch 'dev'