codepro fixes
forgot to commit
Merge branch 'new-feature-archive' into team3Master