Merge pull request #157 from Dima73/pull2