Merge pull request #21 from dawgtrades/master

merge