Fixing previous patches for add and setfingermap.#76

aoi-buh wants to merge 2 commits intoApsu:masterApsu/cmini:masterfrom

aoi-buh:matrix_fixaoi-buh/cmini:matrix_fixCopy head branch name to clipboard