merged PRs and updated pubspec