Release/0.2.0

Merging release/0.2.0 to master (Contains 0.2.1 release version)