Merge pull request #13 from RogerZhangHS/master

Update 2014 10 17