Feature/puppet double tap

This should be the last pull request before tagging the 0.1.1 release.