Alpha_0.2

All files have modified