mayorova Merge pull request #27 from 3scale/fixes …