Merge branch 'release/0.2'
Merge branch 'release/0.3'
Merging changes upstream
Merge pull request #20 from 00willo/upstream-merge

Upstream merge