Merge pull request #224 from Rafik89/eXtreme-Fusion-master

E xtreme fusion master
Merge pull request #14 from eXtreme-Fusion/master

Merge pull request #224 from Rafik89/eXtreme-Fusion-master