commit
Merge pull request #8 from shepard9811/master

committhx