Minor changes
Bumped version to 1.4.0
Merge branch 'release/1.4.0' into develop

* release/1.4.0: