reimplemented handling of all statements (ifstatements, forstatements and do&while&switch - statements)
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup