fixes #39
Merge branch 'development' of ssh://git@github.com/mozvip/Sick-Beard.git into development