working
Merge pull request #7 from jlemm45/master

working