Merge pull request #5 from delmadden/master

Pull request from master