Merging #245; thanks @b987123