Merge pull request #14 from dawgtrades/master

fix conflict
Merge pull request #45 from jrec15/master

Merge pull request #14 from dawgtrades/master