Prepre final build
Merge branch 'master' of https://github.com/BMK-2331/safeguard