added issue #17