layout (fixes #1)
Merge pull request #2 from MatthiasWinzeler/with-layout

layout (fixes #1)