first commit with puppet support