Merge pull request #1 from reimund/master

Merge
Merge pull request #2 from viktorgunnarson/new_measure

Merge pull request #1 from reimund/master