Fix for real
Logging
Merge remote-tracking branch 'origin/fix_everything'
Naming pom