Internal functions named with _ appended
Merge remote-tracking branch 'origin/master'