Working on issue #1
Fixed issue #1