Merge pull request coderespawn#12 from hyamamoto/dart-1.1

Update for dart-1.1 breaking changes