Merge pull request #818 from isuftin/master

SLD fixed and click-to-identify fix