Merge pull request #119 from DariusIII/dev

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

Dev
Merge branch 'dev' of https://github.com/DariusIII/newznab-tmux into dev