resolved merge error
Merge pull request #94 from sthirugn/ostest

Fixed merge error