Basic test for the issue created.
Parameters notation updated.
Fixes #5. Parsing revised.
Broken tests fixed.
Merge branch 'issue/5' into develop