Solved issue #9

Solved issue #9