Functions Definitions
Merge remote-tracking branch 'origin/master'

Conflicts:
	biopif.py
Functions Definitions
Merge remote-tracking branch 'origin/master'