autor fix, comments order fix
Merge remote-tracking branch 'Cakeblog/master'