Merge pull request #42 from jrec15/master

misc changes
Merge pull request #13 from dawgtrades/master

Merge pull request #42 from jrec15/master