alias cleanup
Merge branch 'myns' into 1.0.2