last changes for redesign
Merge pull request #6 from Parcela/optimisation

last changes for redesign