Merge pull request #39 from samsruti/master

Merging from @samsruti for GCI Task http://www.google-melange.com/gci/task/view/google/gci2014/5817743404171264
@todo task for gci