dev-master is always bad
Merge pull request #173 from GrahamCampbell/patch-1

dev-master is always bad