Merge branch 'develop'
Merge branch 'develop'
Comments, changes to logging