Fix #187 - parsers and writers