fixed conflict
Merge pull request #51 from abouffard/master

Fixed the conflicts