Fixed Maven platform encoding warning
Implemented proper diamond-shaped picking