Merge pull request #5 from androidYibo/master

Merge pull request #5 from slamke/master
Merge pull request #6 from slamke/master

Merge pull request #5 from androidYibo/master