Merge pull request #13 from RogerZhangHS/master

Update 2014 10 17
Merge pull request #14 from TehporP/master

Merge pull request #13 from RogerZhangHS/master