Merge pull request #7 from angeiv/UI1.0

Ui1.0