Merging some latest development fix
Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into Pistachitos