converting the meteor method to take an options object
Merge remote-tracking branch 'origin/master'