Fixing the archive code
Merge branch 'develop'