Merge pull request #29 from b4rtek/x2

X2
Merge pull request #30 from wareczek-test/stable

Merge pull request #29 from b4rtek/x2