longcao Merge pull request #388 from jozic/patch-1 …