design change
Merge pull request #15 from slowbirds/design_change1216

design changed