fritzy Merge pull request #41 from bryant1410/master …