some minor fixes
Merge branch 'group7/develop' into group7/master