Ivan/SteveF - refactoring
Ivan/SteveF - refactoring

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