Added 'gipf' cause it is now needed
Merge branch 'master' into notebook