Fixed RTH-506 and RTH-507
Merge branch 'master' of https://github.com/nexios/nexios