fix & fix & power full
Merge branch 'master' of https://github.com/Azurix78/RMS