0.2

Merging version 2.0 changes with master