some improved for prompt script
Merge branch 'master' into mac