Dev

Merging for v0.1