Merge pull request #1675 from mruz/2.0.0

Replace pairs fix and notRequired option
Merge pull request #1687 from mruz/2.0.0

Empty character constant fix, notRequired to allowEmpty