Critical fix, and add FluidStateMachine
Merge branch 'master' of https://github.com/prasannavl/LiquidState.git