Merge pull request #10 from jwayne/josh

syntax error
fixed stupid errors in preprocessing