Merge pull request #329 from dongcarl/patch-1