Merge pull request #2 from chiiph/feature/improve_which