Fixing of issue #5 is finished