Merge pull request #35 from blackcandy-org/ui-issue

Merge pull request #35 from blackcandy-org/ui-issue #123