tweak design
Merge pull request #12 from rnel/master

tweak design