Bringing Version 2 up to date with Flowmeter branch

Bringing Version 2 up to date with Flowmeter branch