Sample main bootstrapper.
Code tidyness.
Merge branch 'feature/Main' into develop