Logged all button presses
Merge origin/master