Merge pull request #7 from p2t2/DEV2.3.0.0

Dev2.3.0.0
Bug fixes
Undoing change to VE order score computation
Merge pull request #280 from apfeffer/DEV2.3.0.0

Dev2.3.0.0