bug fixed and new feature added