+ close issue #30