Merge branch 'develop'
add logging comments
Merge branch 'master' into develop