Bug fixes
Merge branch 'master' of github.com:rajofchennai/apigee-hacathon