Merge pull request #2 from kpi-knu/master

Merge pull request #1 from romaduban/master
Merge pull request #4 from romaduban/master

Merge pull request #2 from kpi-knu/master