Solved issue #11

Solved issue #11