Merge pull request #89 from zvirusz/patch-5

Fix includes inside function arguments, resolves #88
rework ternary operator support