Corrected namespace so it matches with Janus (except this is still a poor man's version)
Merge remote-tracking branch 'origin/develop'