Merge pull request #519 from dabaopku/master