Merge pull request #1 from g-linde/localmonkeying

Simple local edit
Merge branch 'master' into localmonkeying