Fix merge conflict
Merge pull request #6 from Drakula2k/patch-1

Fix merge conflict