Much more simple
Minor build edits
Merge branch 'release/0.7'