Fixed: NEXIOS-584, NEXIOS-587
Merge branch 'master' of https://github.com/nexios/nexios