Merge pull request #89 from Edzelopez/GEP-53

GEP-53 Multiple fixes and commits
GEP-55 Moved common code to base class