Bundling pull request (issue #286)