issue might be fixed, might be issue with x axis being flipped
Merge branch 'iss21'