Doorkeeper 2 updates

This closes #10.