Merge @kaos changes of new erktrek_shell module