magic.
Merge pull request #45 from BenedictEggers/master

magic.