Merge pull request #162 from gonzalolarralde/android-support

Android support