Just enhancement

please enhance something on #2