Pretty much working
Merge branch 'master' of https://github.com/eversojk/Safelet