Mother of All fixes.
Merge upstream/master
Merge pull request #74 from ColinWa/master

Mother of Fixes