bunch of modifs
Merge pull request #2 from bd-arc/dev

bunch of modifs