Upgraded to polymer 0.5.2