Merge pull request #82 from dejan-brkic/master

Swagger Integration
Merge remote-tracking branch 'upstream/master'