checkout the right branch of puppetmaster