update, late commit.
Merge pull request #33 from daveology/layout1

update, late commit.