Merge commit 'd1baa8b05b6a8164ca04d0fa6424f1ae02f3ec34'
Added more info about shell commands.
Merge branch 'master' into release/0.5.x