Shell code blocks, headers, other minor changes
Merge pull request #1 from IonicaBizau/patch-1

Shell code blocks, headers, other minor changes