@oswin5656 's UI
Merge pull request #59 from HoltMaki/master

@oswin5656 's UI