Fixes #15 and #16
Bump version to 0.2.0.
Merge remote-tracking branch 'origin/master'