refactor naming
several improvement
Merge branch 'master' into datashell
bugfix method loading
Merge branch 'master' into datashell
now work table creation from file