fixed merge conflicts
Merge pull request #29 from jgypsygrrl/master

fixed merge conflicts