Fix for name params, resolves #219
Remove code replaces by prev commit
Swap switch for if/else
Merge pull request #221 from cainmi/issue-219

Fix for #219: binding named parameters broken