fixed UI error
Merge remote-tracking branch 'upstream/master'
Merge pull request #101 from SupunS/master

fixed UI error