fx
Merge pull request #1 from b4rtek/fixed

fx
Merge pull request #2 from b4rtek/dev

Dev