Merge pull request #5 from delmadden/master

Pull request from master
Merge pull request #6 from delmadden/newbranch

Merge pull request #5 from delmadden/master