refactoring
Merge pull request #6 from anru/ref

Switching to through2, etc.