fist commit
Merge https://github.com/ferritox/PowerSAFE