Ok hopefully last change for now. Rearrainged aternoon
Merge pull request #990 from rberger/sv_14_06_28_02

Ok hopefully last change for now. Rearrainged afternoon