Made some changes (I know ... not too helpful :p).
Merge branch 'release/0.2.0'