added logging
Added logging
Merge branch 'dev-logging'