Merge pull request #13 from slava-sh/master