bug fix and viewer enhancement
Merge Jongwoo's update.
Merge remote-tracking branch 'upstream/master'