added more than logging...nice what?!
Merge remote-tracking branch 'origin/master'