Merge pull request #3 from janfasola6git/master

updating from master
kupsztal from feat2

sdf
Merge pull request #4 from janfasola6git/feat2

Feat2