Merge pull request #161 from katiewood/master

merge pause keys
code cleanup