Merge branch airtransporter to master manually