Merge pull request #403 from ndawe/axis

[WIP] consistently index axis from 0 to 2
fix broken underflow() and overflow() methods