Merge pull request #224 from puppet-by-examples/single-branch