abillingsley Merge pull request #270 from richardgroves/patch-3