Added more localization Closes #8 and #9