Update 2014_06_18
Merge pull request #3 from jxgx072037/master

Update 2014_06_18