Rename class
Add protocol
Rename class
Add protocol
Merge remote-tracking branch 'origin/master'