refactored shader code
Merge branch 'develop-SN' into develop-JK