Add bundle and output options
v0.2.0