Merge pull request #11 from dawgtrades/master

stuff