Merge pull request #1 from degupta/degupta

Degupta
Merge branch 'master' of github.com:degupta/juju into degupta