Updated fix for #issue-999 as per comments. Added internationalization, upload functionality, tests