Documentation
Merging with Ashish changesMerge branch 'master' of github.com:abhirakshit/Nirvana