Merge pull request #1 from jerrutledge/master

Pull #2