minor bug corrections
Merge branch 'alpha4' into develop
fixed new step bug
Merge branch 'alpha4' into develop