Directory cleanup
Retrieve layer ID the proper way...
Merge branch 'master' into gh-pages