Merge pull request #370 from 981213/pull_request