TyphoonDefinition+Option feature implemented (#220)
New feature TyphoonDefinition+Option covered by tests (#220)