Fix Issues #147 & #148.
Merge branch 'master' of github.com:srinathanantha/mViewer