Add bundler to dev dependencies
Merge branch 'hotfix/1'