paulmillr Merge pull request #899 from shvaikalesh/master …