Fixed NEXIOS-536
Merge branch 'master' of https://github.com/nexios/nexios