Upgraded to the new Android support library v13