Merge pull request #37 from hdansou/master

remove conflict