Merge pull request #1 from Systemcluster/development

Pull development from systemcluster
Fix Background
Merge pull request #12 from lazy-senior/development

Fix Background