Merge pull request #280 from cdjingit/master