Merge pull request #28 from haoxins/haoxins-patch-1

travis++