Merge pull request #49 from wgallop99/master

pulling
took out duplicates