Merge branch 'release/0.1.2' into develop
bumping version
Merge branch 'release/0.1.4'

Conflicts:
	setup.py