Merge branch 'devel'
updated log file for v1.2.0
Merge branch 'master' into devel