fixes KON-1 KON-10 KON-11
matcher always return map(with parameters or empty)
removed redundant else
merge KON-1-named-parameters with master
Merge pull request #2 from kontinuous/KON-1-named-parameters