Fix Issues #13, #15 - add defaults to parameters