finished
Merge pull request #1 from Wandalen/master

Kostiantyn: finished