Merge pull request #3 from stefmcneely74/master

Pull request