Minor changes referencing to issue #9