Adding shorthand functions

Signed-off-by: Peter Legierski <peter@legierski.net>
Merge branch 'feature-shorthand-functions' into develop
Merge branch 'develop'