fix bugs
Merge pull request #64 from Studyokee/userfriendly

fix bugs