Added argtable files, now compile with -largtable2
Added parameter parsing
Merge master