Todo Task for GCI
Merge pull request #34 from samsruti/master

Merged changes from @samsruti for task http://www.google-melange.com/gci/task/view/google/gci2014/6057186773958656