Register pull requests #217, #221