International registration

Closes #362