Merge pull request #14 from simonthum/master

add local and global measures
nicer names for teuling