Merge pull request #1 from Patmonaghan/master

a