added issue #12