BUg1 fix
BUg2 Fix
Finish Release-1.0