Few extra touches for layer deletion
Merge pull request #920 from isuftin/master

Few extra touches for layer deletion