Merge pull request #2 from DaveRandom/pr/3