Merge pull request #561 from ndawe/master

[MRG] new measurement methods