Porting johnronk@1ec7c61 to Pistachitos branch

Closes #448
Merge branch 'Pistachitos' of github.com:WebSpider/Sick-Beard into Pistachitos