fixing issue #97

Now able to merge as well.