Merge pull request #26 from dawgtrades/master

merges