Blocking control flow when escape is clicked
Fixing errors in code previously obscured by cacching issues
Merge pull request #2 from kurokoda/master

Clearing up bugs previously obfuscated by caching issues