Separated highlighting for different cases (Issue #3)
Fixed regular expression for spaces highlighting
Merge branch 'dev' into 0.5.1