GetnZone and GetnDim simplification
After merging
Small fix to the last commit
Merge remote-tracking branch 'origin/master'