Better comment handling (fixes #142)