Layout
Merge pull request #14 from Rahber/master

Layout