Fixing yet more merge conflicts, gaaargh
Merge pull request #182 from hintjens/master

Merge conflicts