Merge branch 'web' into enhancement-#17
Solved issue with syntax highlighting
Added more tests
Added one more test
Resolves #17
Merge branch 'enhancement-#17' into web