Cleanup

cleanup
Added support for multiple parameters

Added support for multiple parameters