camsong Merge pull request #257 from linhuiw/master