Merge pull request swagger-api#36 from swagger-api/develop

prepare for release

fixed merge error

Merge pull request swagger-api#18 from swagger-api/develop

Merged from develop

Merge pull request swagger-api#15 from swagger-api/develop

merged from develop

added reader test