Merge pull request #36 from Dima73/master