Ivan/SteveF - refactoring
Ivan/SteveF - refactoring

SpringerSBM/gomatic,Backbase/gomatic,Backbase/gomatic,SpringerSBM/gomatic,beano/gomatic,magnus-lycka/gomatic,marcinwalczyk/gomatic,marcinwalczyk/gomatic,magnus-lycka/gomatic,beano/gomatic,jimarnold/gomatic,jimarnold/gomatic