Merge pull request #38 from Tillsten/master

working make_paras_and_func, added test, add to __init__