switching of the y and z coords in an attempt to make the code work better
Merge branch 'master' into iss5