Release/version 0.2

Merge 0.2 release into master, close milestone 0.2