Feature/issue 350 add multi gp

Merging develop.