Added option to not expand jar files