Merge pull request #1 from dasmoth/master

Updated to work with latest Dart.