Merge pull request #22 from ryaninhust/master

random
fix bugs
Merge branch 'master' of github.com:Krazylee/nox
Merge branch 'master' of https://github.com/Krazylee/nox