Dumping all code before mergining with dev branch - @todo : documentation of problem, recommend and user module