Fill in some more one-liners
Merge pull request #4 from moritz/more

Fill in some more one-liners