Finalise Arf2013

Combine short and long arfs
Test
Test source from github