Fix comment/string indentation and keyword blocks
Merge pull request #48 from LnL7/fix-indent

Fix comment/string indentation and keyword blocks