resolve conflict
Merge pull request #75 from mehere/dev

resolve conflict