fix error with unexported functions
Merge remote-tracking branch 'origin/master' into develop