Little optimization
Merge remote-tracking branch 'pborreli/optim'

* pborreli/optim:
  Little optimization