Dev

Merging for 0.5.0