Fixed file merge issue, and cleaned up code
Added language support
Closed #1