Allowing keyword parameters, resolves #458 and #478