modified the version number and description
Merge branch 'master' into concurrent