Merge branch 'compiler_error_fix' into 'master'

Compiler error fix

Closes #18 

See merge request !42
6 jobs for master