Redesigned GP framework
Merge pull request #1150 from votjakovr/develop

Redesigned GP framework