Merge branch 'release/0.1.0'

Merge develop with release.

Must have fucked up in git flow...