Updates issue #5
Use correct axes.
Add tests, and also return undef when there are no records.