Merge branch 'master' of https://github.com/sankalpk/gelfand into psethu-master
attempting to fix merge conflict.
Merge branch 'psethu-master'
Merge pull request #62 from psethu/master

Fixing merge conflict