small fix
Merge branch 'master' into Tobias
Merge pull request #9 from TobyPalmer/Tobias

Tobias