Merge pull request #1 from madre/master

try again
Merge pull request #2 from madre/master

add something new.
Create test
Add blalblabla
Merge pull request #3 from hanchi321/master

update on 20141119
Merge pull request #1 from HettyIsIn/master

合产