this commit closed issue #22