Fix issue #105
Little changes