Merge pull request #1 from stanleyxu2005/trunk

222