V1.1 Figure output fixed Some warning fixed