Merge pull request #8 from gklp/pipernate-v2

Merge pull request #7 from gklp/master