Merge pull request #1 from devinnorris/master

merger