Speaker registration

Merging with 'master'