bugfix, wrong rewrites for neos
Merge pull request #93 from wick-ed/master

reviewed diff and tested locally with 0.6.0