Merged RPC-upscope from repository ianna
Correct geometry and numbering.
Merge pull request #3 from ianna/RE31-RE41-geometry

RE3/1 RE4/1 geometry