Merge pull request #2 from zeke8402/master

Pull request #1