Altered to suit swagger converter
merged