Merge pull request #1 from frodosghost/master

Updates to use bundle in more situations.