resolved conflict
Merge pull request #22 from Saftophobia/t17_mozdan

 resolved conflict