Merge pull request #2 from davinov/master

Add fluid option
Fix main file in .json