fixed a export bug
Merge remote-tracking branch 'origin/master'
image viewer functionality added