Merge branch 'devel'

Version 1.007
Merge branch 'master' into devel

Version 1.007