Bug Fixs

V0.9