Merge pull request #2 from jlwevv/master

hi mom