Fixed #92 #93

Fix the bug and add user feedback.