Edit Logger and Base Hack Class
Merge remote-tracking branch 'origin/master'