Merge branch 'prepare-0-4-stable'

Merge branch 'master' into stable

Merge pull request #211 from jvanbaarsen/prepare-0-2-0

Prepare version 0.2.0

Merge pull request #193 from jvanbaarsen/prepare-0-1-0-release

Prepare release of version 0.1.0