UX
Merge pull request #10 from indotek68/master

UX