issue #21 solved