stanfieldr Merge pull request #161 from real-or-random/patch-1