Merge pull request #2 from ComSSA/master

another update from upstream
fixed bug where \\ in expressions would become \ instead of \\
Merge pull request #7 from delan/master

fixed bug where \\ in expressions would become \ instead of \\