Add some new feature

@techpeace, could you review?