samturrell Merge pull request #2 from mattsims/patch-2