Replaced indented code blocks with syntax highlighted ones
Merge remote-tracking branch 'origin/master'