Comments fixed
Fixed issue #2