Update 2014_06_24
Merge pull request #7 from jxgx072037/master

Update 2014_06_24