Merge branch 'devel'
log version v1.4.0
Merge branch 'master' into devel