Merge pull request #10 from jbantug/master

design update 100213
update 100313
Merge pull request #29 from delorenzana/master

update 100313