Fixed issue #22 .