Merge pull request #3 from qiheme/master

Fixed some shit