Merge pull request #9 from fogzot/fluid-ctors

Fluid ctors