Design fixes
Merge pull request #12 from fedo/master

Design fixes