Solved issue #31