fixed merge errors
Merge pull request #15 from dermatobia/fix_merge

fixed merge errors