minor fixes in GP framework
Merge pull request #1511 from votjakovr/feature/gp_refactoring

Minor fixes in GP framework