added some new options
ver 1.1