Added user asolkar
Resolved merge conflict
Merge pull request #265 from asolkar/master

Resolved conflict