merged against dev
Merge pull request #32 from syegres/fixfor_fx-116-1

merged against dev