Updates for v0.7
Code updates to v1.0