Merge pull request #32 from missoby/master

design
pch 38
15/09/3013