Added support for 'named' parameters
Fixed error message