Fixed several bugs.
Merge branch 'master' of https://github.com/nexios/nexios