change related to issue #3 and #1