Update to master

Updated master by mistake, renamed files tidy up output add usage.
correct argv count