Clean merge conflicts
Merge pull request #6 from aivus/patch-1

Clean merge conflicts