te
Merge branch 'master' of github.com:nyassin/safepal
almost final