Fix refreshing UI
Merge remote-tracking branch 'upstream/master'
Merge pull request #85 from mikelimantara/master

Fix refresh UI