Changes to vbf optimization code that were left out
Merge pull request #130 from musella/master

Changes to vbf optimization code that were left out