Merge pull request #136 from XhmikosR/master

Various tweaks.
Fixes #126 - adds proper handling of CSS expressions.