Merge pull request #1 from lgbbm/master

2013.5.7 start
2013.5.7 commit
Merge pull request #2 from 491197269/master

2013.5.7 commit HQD