Crosslink issues #51 and #52 and by this way resolve #51 by P/R of #52