Merge pull request #2 from slamke/master

update20140707-1
Merge pull request #2 from androidYibo/master

update20140707-2