Button tap now registers
Merge remote-tracking branch 'origin/master'