up to latest borschik
Merge pull request #1 from doochik/master

up to latest borschik