fixed #22
Merge pull request #29 from andrewvergel/dev

fixed #22