Fremen
Changed version to 'master'
Merge pull request #140 from gestom/strands-devel

FreMEn towards release