Development

Merging the development for the 0.2.0 release.