Updated to dart 1.2