Preparing for better Pipeline program.
Better pipeline! Huzzah!
Merge pull request #198 from shilad/better-pipeline

Better pipeline
Merged with master.