adds logging
Merge branch 'settings' into dev
Fixes travis tests