closes: issue #21