Add independent pass for each option
Added  option (close #17)