Fixed Arguments Parser

Arguments Parser

There was a minor issue with arguments parser, due to which parser could incorrectly process template. This release includes fixes for this.