Merge pull request #314 from cpoulain/master

Bundle service integration and SSL configuration