Merge pull request #143 from joshuaabenazer/master

Rename "lang" folder to "languages"
Minor code refactoring