Pull request for #234

Note: the branch was created from pallav's branch. I have no idea how to fix it in a better way so I simply reverted the commit (it was just a small commit).