Merge prq to foca

Issue 3