fixing issue #3 using extra parser for statements, unit test added