Merge pull request #11 from TehporP/master

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

2014 10 2