Create test
Add blalblabla
Merge pull request #3 from hanchi321/master

update on 20141119