Merge pull request #18 from yuta-hamada/gui-dev

update and cleanup