done with alpha0.3. Need to test
Merge branch 'alpha0.3'