Steve Penrod Merge pull request #2 from gras64/master