Merge conflicts are fun.
Merge pull request #443 from Glitchfinder/master

Merge conflicts are fun.