Merge pull request #1 from Whoami0117/master

Fixed some bugs