Merge pull request #48 from lyncodev/fix-set

Set expressions fix
Whitespace control added for all tags