ChevyRay Merge pull request #1 from lopopolo/patch-1