Merge pull request #217 from cheekyhalf/master