Merge pull request #222 from andrewjpage/pipeline

Pipeline
Merge pull request #223 from andrewjpage/pipeline

GPL