fixed bug in new ps1
added hg to ps1
Merge branch 'master' into work