Improve preprocessor.
Merge pull request #43 from r-e-d/master

Improve preprocessor.