Merge pull request #4 from X39/dev_X39

Dev x39
Merge pull request #6 from X39/dev_X39

4.4 pull
Merge pull request #7 from X39/dev_X39

ALPHA 4.5
Merge pull request #3 from X39/master

Master merge