Fixes for virtual methods
Merge https://github.com/ciplogic/CodeRefractor into ronald