some bug fixes
Merge branch 'master' of github.com:globocom/database-as-a-service