Fixed decl after stmt
Merge branch 'develop/6' into develop/7