Conflict branch
Merge pull request #9 from KateOl/conflict

Conflict branch