more responsive stuff
Merge pull request #33 from phrichards/master

more responsive stuff