integrating preproc into standard loader
merge Loader changes
Merge branch 'rwhaling-master'