Work on pre-processing steps
Merge pull request #270 from bstell/master

Work on pre-processing steps