Pause button almost working properly
Merge remote-tracking branch 'origin/master'