Merge branch 'master' into devel

Version 1.006