Merge pull request #20 from fabiorphp/master

Layout