Merge branch 'develop'
Removed unused stuff
Bumped version to 0.1.1
Merge branch 'master' into develop