almost t final design
Merge pull request #7 from veeps/master

almost t final design