working
Merge pull request #8 from jlemm45/master

working