Added  option (close #17)