Merge pull request #354 from pali/register-with-name