stve Merge pull request #187 from bryant1410/patch-1