stephenplusplus Merge pull request #5 from andrey-goog/patch-1