Upgarde 2014 9 26
Merge pull request #7 from RogerZhangHS/master

Upgarde 2014 9 26