Remove dependeny on six library and add basic MD tag wrapping