Added issue #22 resolution