Merge pull request #245 from dobromyslov/master