Played with logging
Revert "Played with logging"

This reverts commit dbca5922ab611a5107f5a8f4c02433febe557124.
Merge branch 'dev'
Merge branch 'master' into dev