Updates
Merge branch 'master' of github.com:cyrus-/grants
Updated example
Substantially revised 2.1-2.2
Merged