Merge pull request #18 from Dima73/master