[FIX] Better handling when no markdown tag is present, Fixes #8