dev-master makes unicorns cry
Merge pull request #15 from GrahamCampbell/patch-2

dev-master makes unicorns cry