Sync up with markdown-js + our changes