Merge pull request #3 from delmadden/master

Pull request