Merge branches 'master' and 'master' of github.com:tibristo/htautau
Now choose between methods from command line argument