UP
UP
UP
UP
Merge pull request #27 from kvnanytv/master

design update 100213
Merge pull request #28 from delorenzana/master

refactoring
Merge pull request #10 from jbantug/master

design update 100213