update to a good layerfinder pattern
Merge branch 'master' into production