Merge pull request #12 from RogerZhangHS/master

2014 10 2
Update 2014 10 11
Merge pull request #12 from TehporP/master

	Update 2014 10 11