Merge branch 'devel'
README.md
Merge branch 'master' into devel

Version 1.005