Fix for branches conflict.
Merge pull request #119 from DariusIII/dev

Fix for branches conflict.