Update version to 1.4.0
Merge branch 'dev'