Merging raph stuff
Raph stuff full merged
Merge pull request #14 from Drastal/raphaelb-EPF

Raph's modifications merged