merge from Working branch alpha4. 

Last update for alpha4.