minor changes. fixed issue #2