merging
Merge branch 'master' of https://github.com/nyassin/safepal
test