Merge pull request #4 from slamke/master

update20140711-1
Merge pull request #4 from androidYibo/master

Merge pull request #4 from slamke/master