Merge pull request #38 from kevmoo/master

More finals, better pubspec