#29: Wrap the short code methods in class
Merge remote-tracking branch 'origin/master'