Merge pull request #1 from iltar/master

Initial setup of the bundle that allows configuration
Merge remote-tracking branch 'upstream/master'