late commit.
Merge pull request #24 from daveology/layout1

late commit.