Added markdown support and comments