Development v0.2

Merging v0.2 into master for release