First commit for susytools-03-21