pull request from yi zheng

Update my code 2013.09.27