bug fix with 4d scan
Merge branch '1.0' into autocentring