Push 0.7.0 changes to master