Merge pull request #100 from nhr/master

Replaced local use of  with which()