better preprocessing infrastructure
Merge branch 'master' of github.com:veltzer/myrepo
another small fix