Fixes #11
Fixes #12
More code independant from each other. Compilation speed optimized.