Added some description, and tests
Merge branch 'master' John's and my changes: flair, tests, and some
additional description

Conflicts:
	README.md