updated to dart 1.6