fixed merge conflicts
Merge pull request #19 from ernbrn/merge

fixed merge conflicts