Merge branch 'bugfixes' into 'master'

Parenthesis Issue and better Tests.

See merge request !12
2 jobs for master in 2 minutes and 45 seconds