Merge branch 'develop'
changes that are only for master branch
Merge branch 'release-0.1'
Merge branch 'develop'
Minor updates in documentation, bump version to v0.1.1
Merge branch 'hotfix-v0.1.1' into develop
reverted makefile for develop branch