Merge tag '0.1.4' into develop

0.1.4 0.1.4

* tag '0.1.4':
  bumping version to 0.1.4
Merge branch 'develop'

* develop: