Some modif
Merge pull request #1 from woostrowski/f_new

Some modif