merge ianforsyth:play_pause. fix readme conflict