Fixes #5 using the new api and bundle