merge commit ce376ff
fixed the bug that appeared during the picking
picking bug fixed for version 1.3.x