added nomodule option to not wrap modules