Merge pull request #1 from iyudincev/master

bugfixes