tried to remove conflicts
Merge pull request #8 from metulburr/master

tried to remove merge conflicts