Solved issue #12