- merged patch from Ricard Garrido Olivares  
- merged patch from Ricard Garrido Olivares
 

tectronics/jspgnviewer,tectronics/jspgnviewer,newsavatar/jspgnviewer,newsavatar/jspgnviewer,newsavatar/jspgnviewer,tectronics/jspgnviewer,tectronics/jspgnviewer,newsavatar/jspgnviewer