Solved issue #11