#1004: #1002: markup problems fixed

opened by thuchacz