jeppe's corrections
Merge pull request #34 from steinwurf/jeppes-corrections

Jeppe's corrections