Merge pull request #2 from gwicke/master

WIP: Some more fixes & improvements to rewriteExpression