fix font-size problem
fix conflict
add label name
Merge pull request #5 from peacedove/master

label name