Update 2014 10 2
Merge pull request #10 from RogerZhangHS/master

Update 2014 10 2