Fixed comment model. fixed #77

View #77 for details