Merge pull request #17 from mar-kolya/master