Merge branch 'conditional-beans' into 'master'

Conditional beans

Closes #35 and #50

See merge request !157
6 jobs for gib-build