Merge pull request #41 from Dima73/master