reverting conflict resolutions
Merge pull request #24 from sameerak/master

reverting conflict resolutions