Merge pull request #28 from euromake/bug17

Leaving recursive construct recognition to the parser