Fix error in argument parser
Merge branch 'xifi' into develop