Return references. Fixes #33, #34