This closes #398

Updated to detect all different ways to identify zip files.