More fixes
Merge branch 'master' of https://github.com/strivedi183/version_airlines