Merge pull request #320 from OwenBrotherwood/master

Note that not all are compatible with Swagger V2.0