Added Module Support
Removed while(1);