some new changes
Merge pull request #1 from KN-DEV/wojtek

some new changes