Added markdown support and numbers