New version
Added markdown support