Version 0.6

* Clean up the code to be more modular.
* Catch Ctrl+Shift+Q as well.