Merge pull request #381 from jlaura/weights

Weights