added Ryan version
Merge branch 'ryan' into frank

Conflicts:
	ff_tests.ipynb