Fix for bug #18: merged files and incorrect module loading