Merge branch 'master' of https://github.com/aconite33/BlackLight.git