Closes #145 fixing keyword dumping