PR from develop to master

welcome to comment my work
missing empty line before namespace