Fix Bundle Configuration
Fix Tests
Merge pull request #29 from winzou/patch-1

Fix Bundle Configuration