merged pull-requests from @milligramme, @Goyaka, @pixelistik, @abe33, @nukleas and @dahiro.