Merge pull request #188 from pisaychuk/master

extra check added
code formatting