Return references. Fixes #33, #34
Merge pull request #36 from baldurrensch/return_references

Return references. Fixes #33, #34