Dev

Merging for 0.7.7