handle bundle options
Merge branch 'master' of https://github.com/steinwurf/steinwurf-labs