merged Quentin Brissaud's new modifications; he also got rid of unused variables
Merge pull request #68 from komatits/devel

merged Quentin Brissaud's new modifications; he also got rid of unused v...