Fixed stubs
Readme fixup
Added a license file
Merge remote-tracking branch 'origin/2.2'