Fix */* and q=0 cases
Merge pull request #260 from xfra35/issue#260

Fix */* and q=0 cases