Merging #268; thanks @jhnns !