changed naught parser to use pairs instead of strings
merged with pair branch
merged with head