Small changes to muffinlib, and examples of usage.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md