re-introduce some helper methods
Merge remote-tracking branch 'origin/master'