Bug fixes & modularize code
Small fix
Merged files
Merged files