Merge pull request #16 from Dima73/master