Fix bundle issues
Merge pull request #1 from andreijs/patch-1

Fix bundle issues