Merge pull request #20 from avkrotov/reference