Merge pull request #544 from rojepp/master

Implement interface: Sync with fixes in VFPT