Merge pull request #7 from xtao/vilya

Add highlight code.
Fix highlight code.