UPDATE

Change output array fill method, add keywords, fix test.