added logging
Merge branch 'dev'