Convert to OOP for Short code, #2
Merge remote-tracking branch 'origin/master'