Fixed #103
Fixed issue #104