add _ prefix to some imports, it seems omitting them causes trouble on unix
Merge branch 'develop'