GEP-55 Moved common code to base class
Merge pull request #90 from Edzelopez/GEP-53

GEP-55 Moved common code to base class