Fix for multiple optional params
v1.1.1