Code highlight and other minor changes
Merge pull request #1 from IonicaBizau/patch-1

Code highlight and other minor changes