Fixes #27

Sorry @neerajbaid I had a little issue and so I had to merge your PR this way.