diff --git a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/models/SurveyModel.java b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/models/SurveyModel.java
index 38f73ec..0df9110 100644
--- a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/models/SurveyModel.java
+++ b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/models/SurveyModel.java
@@ -67,8 +67,7 @@ public void setImage(String image) {
         this.image = image;
     }
 
-    public int[] getQuestions() {
-        return questions;
+    public int[] getQuestions() {return questions;
     }
 
     public void setQuestions(int[] questions) {
diff --git a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveyActivity.java b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveyActivity.java
index edbefcf..8ca6e57 100644
--- a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveyActivity.java
+++ b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveyActivity.java
@@ -12,6 +12,7 @@
 import android.widget.Toast;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 import es.academy.solidgear.surveyx.R;
 import es.academy.solidgear.surveyx.api.APIService;
diff --git a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveysActivity.java b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveysActivity.java
index 214efd8..909157f 100644
--- a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveysActivity.java
+++ b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveysActivity.java
@@ -22,6 +22,8 @@
 import com.google.android.gms.tasks.OnSuccessListener;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import es.academy.solidgear.surveyx.R;
@@ -226,6 +228,12 @@ private void fetchAllSurveys() {
         APIService.OnResponse<SurveysModel> onSurveysResponse = new APIService.OnResponse<SurveysModel>() {
             @Override
             public void onSuccess(SurveysModel surveysModel) {
+                Collections.sort(surveysModel.getSurveys(), new Comparator<SurveyModel>() {
+                    @Override
+                    public int compare(SurveyModel o1, SurveyModel o2) {
+                        return o1.getTitle().compareTo(o2.getTitle());
+                    }
+                });
                 showSurveys(surveysModel.getSurveys());
                 dialog.dismiss();
             }
diff --git a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/fragments/QuestionFragment.java b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/fragments/QuestionFragment.java
index 6b9dfdc..534cf55 100644
--- a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/fragments/QuestionFragment.java
+++ b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/fragments/QuestionFragment.java
@@ -4,10 +4,12 @@
 import android.app.Fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatCheckBox;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -89,11 +91,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         answersOutlet = (RadioGroup) root.findViewById(R.id.answers_outlet);
 
         for (OptionModel option : question.getChoices()) {
-
-            // Create radio button with answer
-            AnswerRadioButton radioButton = new AnswerRadioButton(getActivity(), option.getText());
-            radioButton.setTag(option.getId());
-            answersOutlet.addView(radioButton);
+            //Si la cuestión es de tipo "select-multiple" pone los botones en checkBox si no en radioButton
+            if (question.getType().equals("select-multiple")){
+                //AppCompactCheckBox para que funcione en todas las versiones de Android
+                AppCompatCheckBox checkBox = new AppCompatCheckBox(getActivity());
+                checkBox.setText(option.getText());
+                checkBox.setTag(option.getId());
+                answersOutlet.addView(checkBox);
+            }else{
+                // Create radio button with answer
+                AnswerRadioButton radioButton = new AnswerRadioButton(getActivity(), option.getText());
+                radioButton.setTag(option.getId());
+                answersOutlet.addView(radioButton);
+            }
         }
 
         RadioGroup.OnCheckedChangeListener onAnswerChecked = new RadioGroup.OnCheckedChangeListener() {
diff --git a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/views/AnswerRadioButton.java b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/views/AnswerRadioButton.java
index 954ad2f..49a75eb 100644
--- a/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/views/AnswerRadioButton.java
+++ b/Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/views/AnswerRadioButton.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.support.v7.widget.AppCompatCheckBox;
 import android.support.v7.widget.AppCompatRadioButton;
 import android.util.TypedValue;
 import android.view.Gravity;