Merge pull request #610 from lipnitsk/master