Fixed some bugs and fixed some rodekruis spelling errors.
Merge branch 'master' of https://github.com/nexios/nexios