Swagger upgrade
Merge remote-tracking branch 'upstream/master'
Merge pull request #83 from dejan-brkic/master

Swagger upgrade