Merge pull request #26 from dawgtrades/master

merges
Merge pull request #83 from jrec15/master

Merge pull request #26 from dawgtrades/master