Merge pull request #3 from delmadden/master

Pull request
Merge pull request #4 from delmadden/newbranch

Merge pull request #3 from delmadden/master