merge with latest jason
fix CDPATH and shome