Solved issue #23

.... See issue #23