samturrell Merge pull request #1 from rowancollins89/patch-1