Merge pull request #2 from brianmcgue/master

Updates