(probably) Fixed a bug.
Merge branch 'master' of https://github.com/pendingchaos/WIP8