Merge pull request #11 from fedo/master

Merge c'mon
Design fixes