Merge pull request #35 from ChrisBoesch/master

update
UI update
Merge pull request #121 from LI-HE/master

UI update