0.7.0 Release
Merge w/ master