Preperation for LuMiCuLa integration
fixing #50
add if statement by fixing #50
not needed
Merge branch 'origin/master'