Merge pull request #268 from asuhov/master