Refactorisation of main class.

Signed-off-by: Tarjei400 <adrian.jutrowski@gmail.com>
Merge remote-tracking branch 'origin'
Readme change.

Signed-off-by: Tarjei400 <adrian.jutrowski@gmail.com>