Fixed isue #10