changed archive to work-archive. Fixed adaptive images
Merge remote-tracking branch 'origin/master'