Fix bug and new feature