Merge pull request #6 from endlessm/shell/3910

Shell/3910
new content