separators and fluid
 fixes #7, fixes #3
Merge remote-tracking branch 'origin/master'