diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 000000000..5afbb7507
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,36 @@
+pool:
+  vmImage: ubuntu-16.04
+trigger:
+  - master
+steps:
+  - task: Npm@1
+    inputs:
+      command: install
+  - script: 'npm test'
+    displayName: 'Run unit tests'
+    continueOnError: true
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results'
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml
+  - task: PublishCodeCoverageResults@1
+    displayName: 'Publish Code Coverage'
+    condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')'
+    inputs:
+      codeCoverageTool: Cobertura
+      summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml'
+      reportDirectory: $(System.DefaultWorkingDirectory)/coverage
+  - task: ArchiveFiles@2
+    displayName: 'Archive sources'
+    inputs:
+      rootFolderOrFile: $(Build.SourcesDirectory)
+      includeRootFolder: false
+  - task: CopyFiles@2
+    displayName: 'Copy ARM templates'
+    inputs:
+      SourceFolder: deployment
+      Contents: '*.json'
+      TargetFolder: $(build.artifactstagingdirectory)/Templates
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
\ No newline at end of file
diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index f9af6ab4f..276444bcf 100644
--- a/src/services/airports.service.js
+++ b/src/services/airports.service.js
@@ -8,7 +8,7 @@ class AirportsService {
     }
 
     getAll(){
-        return this._airports.filter(a => a.code).map(avoidEmptyCity);
+        return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1);
     }
 
     getByCode(code) {
diff --git a/src/services/book.form.service.js b/src/services/book.form.service.js
index c0e00b35b..877554810 100644
--- a/src/services/book.form.service.js
+++ b/src/services/book.form.service.js
@@ -9,7 +9,7 @@ class BookFormService {
         return  {
             kinds: [
                 { text:'Round trip', active: true},
-                { text: 'One way' },
+                { text: 'One way ' },
                 { text: 'Multi-city' }
             ],
             today: moment().toDate(),