Merge branch 'master' into io
Added help for built-in commands