Made all changed discussed with Nipun this morning on Google
Hangout (and commented in the previous commit on github). #12