improved fix for Issue #97
improved fix for Issue #97

webdev1001/webshim,pablogrela/webshim,ilovezy/webshim,cl4rke/webshim,webdev1001/webshim,tomascassidy/webshim,fashionsun/webshim,tomascassidy/webshim,fashionsun/webshim,pablogrela/webshim,fashionsun/webshim,aFarkas/webshim,cl4rke/webshim,webdev1001/webshim,aFarkas/webshim,pablogrela/webshim,tomascassidy/webshim,cl4rke/webshim,aFarkas/webshim,ilovezy/webshim,ilovezy/webshim