script fix
Merge branch 'lampscriptfix' into dev