Merge pull request #14 from dawgtrades/master

fix conflict