Better parameter handling

[skibum55]

The function should take an options structure instead of having to be modified every time a parameter is adding. That should handle nil parameters without explicit error checking too.