Merge pull request #8 from jpsacha/master

Improvements to layout, syntax highlighting, and display of the source code
Fix Issue #6: Error on second run