[sr-dev] git:master:498e225b: Merge pull request #186 from norox/master