Add support for RFC-4180
Update documenation
Update tests