updated to Dart 1.6