Feat internationalization

This Merge fixes #22 and #41