Merge branch 'release/v0.1.1' into develop
Merge branch 'master' into develop
Fixed makefile renaming bug.
Fixed url in setup.py
Bumping version for release.
Merge branch 'release/v0.1.2'