Now separates FluentNAO stanzas. Closes gh-91
merged upstream