Merge pull request #1 from titarenko/master

Merge pull request #33 from semack/master