Enhance code highlighter

Fix #4