Merge branch 'development' of https://github.com/mhild/Sick-Beard