Fix Parser agruments
Trying to create rectangle draw - not finished
Merge branch 'refs/heads/HistoryFigures'