Merge pull request #3 from slamke/master

testPull20140705-3
Merge pull request #3 from androidYibo/master

20140710-1