Design update
Design update fix conflict
Merge pull request #3 from Alex237/master

Design update