Add private functions to private interface (allows gcc compile)
Merge remote branch 'origin/master' into fancy-expand