This is the second commit message
Merge branch 'shell_branch'