Issue #14
and remove wrong comments