merge pull request #26 from dawgtrades/master