Merge pull request #29 from b4rtek/x2

X2