CuboxI: further improvements from warped-rudi
Merge pull request #3408 from susisstrolch/CuboxI-warped

CuboxI: further improvements from warped-rudi