closes issue #226