Fixes for 'base' as key and bad response
Merge pull request #5 from amachwe/issue4

Fixes for 'base' as key and bad response