update 20140717
Merge pull request #1 from goodbest/master

update 20140717