Return consistant data types

See issue #1