V0.7

Merged changes from origin