Merge branch 'release/0.1.4'

* release/0.1.4:
  bumping version to 0.1.4
Merge branch 'develop'

* develop: